Revision: bazaar--devel--1.1--patch-83
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Sat Jan 22 11:10:16 EST 2005
Standard-date: 2005-01-22 00:10:16 GMT
Modified-files: libarch/ancestry.c libarch/arch-cache.c
    libarch/cached-archive.c libarch/my.c po/en_AU.po
    tests/test-archive-registration.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-5
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-83
    thelove@canonical.com/bazaar--devo--1.1--patch-109
    thelove@canonical.com/bazaar--devo--1.1--patch-110
    thelove@canonical.com/bazaar--devo--1.1--patch-111
    thelove@canonical.com/bazaar--devo--1.1--patch-112
    thelove@canonical.com/bazaar--devo--1.1--patch-113
    thelove@canonical.com/bazaar--devo--1.1--patch-114
    thelove@canonical.com/bazaar--devo--1.1--patch-115
    thelove@canonical.com/bazaar--devo--1.1--patch-116
    thelove@canonical.com/bazaar--devo--1.1--patch-117
    thelove@canonical.com/bazaar--devo--1.1--patch-118
    thelove@canonical.com/bazaar--devo--1.1--patch-119
    thelove@canonical.com/bazaar--devo--1.1--patch-120
Summary: merge in aarons bugfix for the cache ancestry support
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-113

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-1
   Added test for achive registration with no .arch-params

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-2
   Fixed registration-without-.arch-params test

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-3
   Ensured cache can be set when .arch-params does not exist

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-4
   Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1.1--patch-5
   Fix double-newlines in ancestry files & get/put_line input validation

 * thelove@canonical.com/bazaar--devo--1.1--patch-109
   tweak the diff dot-progress code, the carriage return was emitted before the callback-calling function was called.

 * thelove@canonical.com/bazaar--devo--1.1--patch-110
   update the translations and add new ones for af cs de en_AU en_CA es_AR fi fe fe_BE he it_IT lt nl_BE pt_PT

 * thelove@canonical.com/bazaar--devo--1.1--patch-111
   post-freeze fix: status should not print warning about lint cleanliness when not trying to list the changes

 * thelove@canonical.com/bazaar--devo--1.1--patch-112
   tweak the fix for the archive-pfs race condition to not penalise the common case

 * thelove@canonical.com/bazaar--devo--1.1--patch-113
   enable the archive cache for ancestry calculations (fixes too-much-network regression) and add a \n to the archive version error string

 * thelove@canonical.com/bazaar--devo--1.1--patch-114
   Ensured .arch-params exists before setting cache path [fixes #5420]

 * thelove@canonical.com/bazaar--devo--1.1--patch-115
   bugfix: cannot add symlinks to missing paths. closes: #59

 * thelove@canonical.com/bazaar--devo--1.1--patch-116
   dont use patch_ancestry with an invalid project_tree. closes: #5524

 * thelove@canonical.com/bazaar--devo--1.1--patch-117
   implement commit --just-commit for scripting support. closes: #55

 * thelove@canonical.com/bazaar--devo--1.1--patch-118
   fix committing to a specific version with a non-existant current tree version. closes: #56

 * thelove@canonical.com/bazaar--devo--1.1--patch-119
   do not use a cherry picked patch as a common text for a merge base point. closes: #5411

 * thelove@canonical.com/bazaar--devo--1.1--patch-120
   fixup en_AU coarse language

